Fixed uncommitted tests. Optimized code and created new Grouped mocks. Added now passing tests to repository.