Re-arranging tests to get better coverage