Google coding style fixes
Delete old condition for tests