Issue 6 test update, new tests running