added xin's controller tests after fixing the bad commits to master branch