More tests, more functionality