Adapted tests for the last commit