improve loader and add tests