Fixed 14/15 unittests
All tests are functional