Add tests and fix test errors #1