Move the testing to the unit tests!