started tests; fix #179
Fixes #179
Merge from mcasimir