Adding can?, some tests, and the fixes that go with them