start fixing tests