removed dependency
started to move tests to unit tests.