Updating test code as well