Merge pull request #143 from rcchan/pr-merge

 Fix and clean up unit tests from pull requests