[bootstrap plugin] cleaned packages, tweaked white-space in generated code
WIP test cleanup