fixing tests and small pieces before the big merge