ENH+FIX: Adding MEGSIM support, fixing minor testing bug