WIP adding stress tests, next commit fixes model issues from FKs