updated tests and changes