fix issue #3: some tests fixes