Fixed tests (HIVE-2416)
Fixed eclipse template
Merged changes from commit 5be54f9d1736d9f1b0c15bd8a8680027d2201c98
(updated for the 0.11 api)