Re-namespace mock wrapper into main source not just tests
Re-namespace mock wrapper test