more tests and better defaults