Fix a couple of previously ignored tests