Fixed a few failed tests. Still need to fix more.