Move TestScreen down in the screen class hierarchy.
Code cleanup,