Fix AWS user parsing and tests