fixed tests, its more like a work-around, but it works perfectly. closes #88