More work done trying to get UI tests to pass