Tests closer to passing, new res page