remove and fix old tests