More tests and better code coverage