adding missing db.session.add calls, breaking test down a little