converting last few tests