test added and warnings removed