fixes #377; general updates to first v2 tests and models