Cleanup in tests, added test for MR