add new traces for tests + new model (Hakan)
Merge branch 'feature-fixes' into develop