Controller Test updated