fixup! Added more testing tools