Mock with a visitor
Split Dependencies and mocks
Re organise unit test namespaces
re created test