WIP refactor model to track data about completion of test