Small edits to make ad-hoc testing possible