actually start fixing tests