Fixed Tests and use Any