Fixed and improved failing test cases (#19).

All 632u, 343i tests pass.