Added test project and modified DbContext, services