Employ mikemcquaid's tips
Add simple test