fixes #12 - need to make follow-on ticket for more comprehensive controller tests