Move testing stuff into test group