More tests, more passing