Test Refactor and Collection Bug Fix

- Refactored test data creation to use promise chain
- Fixed bug where models were still being added to collections