Started testing MetaModel while also refactoring a bit more by moving code between ExpDesign and MetaModel