Tests fixes try 2