Completely refactored and simplified test specs.