Hack fix to get tests working again