Relocate tests to make paths easier
Add implementation and additional helper methods to model