now refactored the feature files
add cleanup and sort out coverage.