Removed duplication from tests
Implemented grep -A