Fixed tests. all passing