resync with justinsb repo
tests improvements
Merge pull request #1 from alesaudate/master

Resync with justinsb's repo + improvements to tests