updated controllers and removed Test files