upgrade loader && add tests
tests