Removed final instances of before and after in tests