moar testing and tooling