test fix, checkstyle, eclipse warnings