testing issues Fixed