Tests fixed and updated

Test re-runned, got some regressions on a few methods, everything is fixed