fix tests where applicable