model concept + filename fixes + tests