Issue refs #1768: split models, implement separate db test data creation