Updated versions
Updated test logic