more tests and removed warnings