testing improvements &c