Fixed tests to match changes