Fixed up tests