Less logic in the mock
Adding testing conversate for , moving test functions into isolated package