Add some tests that wouldn't have passed before