Add collection model and tests, delete some specs