Fix four tests, ignore two that appear to be works in progress.