Updates to use wait screen.
Updated test.