Reactivate failing tests due to jdk7 upgrade