Refactored a little so I could make my tests more specific.
Refactored release 1.