updated test as well