Added missing tests.
Fixed specs.