More test, fixed more "features"