Fixed tests

See #164