mark-to-market cycle update
cleaned up unit tests