Fixed failing unittest