Update tests to work on the universal app