More tests passing.