cleaned up evaluation a little bit and started work on test 6