Fixed UTs for issue #80