remove a trivial test, make some other tests less trivial.