Bug fixs for registration and batch test
Merge pull request #493 from flytoj2ee/master

Bug fixs for registration and batch test