More tests passing