More tests, more functionality.