new archtecture for report, tests removed for now