Fix tests and add new ones