Updated test and remove shortcut return statement in loader