Fix tests

This gets all the specs passing again.