fixing tests - pending