Hopefully fixed broken tests