added testing + controllers