Test/build modifications and style changes