Adding better unit tets with custom test runner, have to try on OSX now