Remove useless data members and fix a small bug
Updated test cfg files