Simplified strategy and added tests to achieve 100% coverage.