[#9] renaming some test vars and making it complient with java 6

First pull request with some little refactorings!