added few classes for screens and tests