Commit Tests Controllers  refs #321
Merge remote-tracking branch 'origin/dev' into dev