Some progress on getting tests to pass, but many still fail