Fix a whole bunch of specs. Code coverage substantially improved.