Add includes that make tests pass