Create separate loader class with test