Straighten out unit tests