Added testing modules and some common tweaks
Merge branch 'master' of https://github.com/suprahfly/sandbox