Finalize refactoring models, test with modules