Adapted test to run in new environment (app engine 1.8.7, jdk 1.7.0 40).