removed mock
fixed typo introduced by cleanup
fixed remaining unit test issues