Fixes #20
Test data fixed
Fixes #42, #60