fixed broken test and issue #1