Ported the remaining tests. There are still several failing.