Add tests to basic functionality
Rogue merge conflict