Refactor assertions/harness in a saner way