WIP: bootstrap tests passing
WIP: plugin tests passing