Bug fix for #300.
Unignored some tests which now pass.