add tests
comment out functions requiring jdk 1.7