Fix tests and add info