Changing tests to meet backend changes