Made mocks working
Cleanup of code, made all calls stubs. Need integration test now.