small changes and test updated