SOme more fixed tests and warnings removed