Temporarily removed unittest