TEST: Updated tests to fit with new user interfaces.