started fixing tests