Fix tests and changes