Tests pass now, using 'goapp test'