Updated Return and Test