More tests, we're getting there