Removed another assertion
Mock and refactoring tests