Merge pull request #1 from btbinhtran/testem-branch

Added testem testing and fixed old failing test setup