Minor fixes to subsample test and mbar free energy zeroing.