Changed functional tests and unit tests to account for saving user input