Added functional testing to controllers