fixing tests and getting screen working