fix demo models imports after renames (doh!) and hurray for automated tests :)