Fixing tests. All passing.