Made switching in different test types easier