Added consistency
Update tests toop