Remove more related tests