Ugly tests removed