changes for ios custom class implementation. don't use $ in filenames since that will cause problems in shell
merge
fix test case