Tests refactoring and added test for https://github.com/homeaway/thunderhead/issues/3