Merge pull request #23 from vmoravec/master

Small enhancements to Rakefile and test files
Fix requiring test_helper