lots of changes, test case generation and import