Unit test fixes
Removed unit test, does not make sense to test that now