Bug 967579 - Build test code style