Comment out unused features (for now), update test suite