Add tests and more assertions