Speedup

10x tests speedup, requires merge of PR #33.