Better testmodel bootstrapping
Now compiling!
Merge pull request #594 from alexkalderimis/i592

Fixes #592