fix test and update to jdk1.7