Nexus 6027 testsuite cleanup