More tests and converage