unit tests fixes #1
unittest fix #2