COMP: Style cleanup, fix to test directory