Fixed tests. All passing