add other tests and make more consistent