Update tests and make them pass again; fixes