Fixed tests to account for changes