Merge pull request #480 from stianst/master

Started test tools module