more tests and more consistency