Test classes
Merge pull request #19 from newair/master

Test classes