Match screen and stylesheet name; add screen test