improved unit tests, made code more robust against signature failures