tests and some other files corrected