Tidy up the namespace usings
Add serviceLayer test assembly