Convert loader until test to functional test