Please don't merge - i'm using test harness to check for errors