begin fixing tests