Finishing the unit test, it covers most stuff