Add the unit tests I have been writing all along