Fix and split tests