Fixed requesting test issue, reordered tests.