#102 master - fix tests