Minor tweaks
Improved model test app