More tests, better signatures for public methods
Faster unit tests