After the refactor... filling out some unit tests