fixing tests. not finished