fixed bugs ... dank tests!