some corrections (mainly tests)