Added Custom Controller test and added Menu/Game states