Fixed etaf tests