Refactor some tests + add benchmark for demoserver
Bump tomboy-library