Improved specs, all tests passing