fixed failing specs as a result of the massive refactoring