removing old Expects
fixing up mspec tests and readding