remove glob from test.sh
Reincorporate new tests
detect jvm version and use correct spec (6, 7 only)