Add tests
WIP