Fixing some more spec/tests.