make tests work, address issue #2