Add Tests

Adds tests. Increases test coverage from 30% to 70% :smile_cat: 
http://i1292.photobucket.com/albums/b574/Cratecatsby/g02mB_zps8c282ea5.jpg