Add new specs and remove unused code
Merge pull request #211 from DefactoSoftware/marthyn/100%

[READY] Getting test coverage to 100%