reorganised tests, added mor