For 348: expands on Collection tests, fixes to models example, some other changes