Changes in Services
Added AssertNotFound exception
Added some tests