fixed tests as per pr comment