Bug fixes + another test.