Adapted tests with new version of code