Modified the tests, not done