fix broken tests and add more