Add failing test as a first step; and fix it if we can for the 0.6 release.
Point about the failing test that I mentioned on skype was just that it's generally good practice to start by writing a failing test when going about fixing a bug. (rather than writing a test that asserts the incorrect current behaviour).