make pull req suggestions

- has_key? to key?
- mock to mock_status
- delegate to class