Update tests for the last refactor