Topic/fix broken tests

oops :)