Test utils refined
Merge branch 'master' of https://github.com/afreel/whiteboard