Minor refactor and alexa runner test structured