Fixed tests. Fixes #203