More unit tests

Brings coverage to 75% (#6)