Issue #80, edited tests