Generaized the test helper structures and functions