Test stuff

Just some harness modifications.