Fixed remaining separate tests