More tests and better verify