Adding test for the options menu and fixing SP and LB tests.