Fixed remaining test failures (See #19).

All 571u, 331i tests pass.