80% test coverage yay!