Removed old tests file from project, change return type on mock