Prepping for some real unit tests