[WIP] Getting test coverage to 100%

![screen shot 2014-12-17 at 17 01 11](https://cloud.githubusercontent.com/assets/642544/5474017/7632de4e-860e-11e4-8601-650e930eb8cc.png)