Filling out the unit tests