Fixed more tests. Getting closer.