Refactor testing. Add benchmarks
Merge branch 'master' of github.com:stephenalexbrowne/zoom