Merge pull request #5 from neoranga55/master

More tests and fixes in test framework
include mac build
Merge remote-tracking branch 'upstream/master'