fixes to collection reset to clean up before adding models, fixes to tests