Adding tests to match changes