Rework testing structure and handling (can still be failing)