Added unit tests and mocking of DataContext