Min changes and tests