Cleaned up mock, added back in import checking