refactored the views and waters spec