fix tests and gc old tests