adapted tests to new ans