TESTS: Add tests