Getting some unit tests back into line