Fixed some tests.
Fixed #110