Moved mock back to tests package