Fixed tests to match the front end changes.