New refactor in test and error solverd