Major refactor of tests

Introduced Mocks finally