re-arranging for testing