Written unittests now passing