returned fixedorder, removed old testing classes