Initial Commit
Added async testing for controller.
More fixes
Merge remote-tracking branch 'origin/master'