Tested all of the classes and reached 50%+ coverage!
Merge pull request #76 from dyxliang/master

Pull update.