some uppdates and test added