Make tests pass
Add tests