Updated tests and gulpfile

Updated the main controller test and gulpfile.