Fixed some tests for the refactor