new unit tests

Now using mock, more to come