fixes #332 - fix tests