Works on test list optimization.
Added models to test list items.
Merge branch 'test-list-optimization' into dev