put a couple of tests back - they seem ok