Merge in new development
Update map controller test