Set tests and fixes