Fix tests and add more