Got it working with tests!