A bit of layout
Rewritten to generate a static Model to be accessed by other tests too