Fix tests or remove them for now