Small updates to get tests to pass largely