Fixing up spec/features tests and views