Added test cases and fixed broken cases
travisplexer: pr-454-osx travis ci test