WIP: Many tests, some failing ones commented out.