Changed definitions in mvcc.hpp to out-of-line
Minor test tuning