bugzid:5896 - Add template Tests
bugzid 9279: fixing an NPE in java client
Merge pull request #26 from bmizhen/bug-9279

bugzid 9279: fixing an NPE in java client
Merge pull request #24 from sailthru/bug-5896

bugzid:5896 - Add template tests