fixed TAPModel persistence, and tests