acu157665 Respond to feedback and add in spec test