clean up medium model and tests