Improved specs, all passing.