Added contact controller and more test