Reverted map controller back - tests were accidently pushed