add test cases and update the loader