Updated for tests to pass