[wip] adjusted tests and improved models