A couple more tests, small fixes