Refactored some class names - broken :S
Merge pull request #6 from Bodacious/dev/unit_tests

Refactored some class names - broken :S