tests and changes