Issue #46, added tests again