set and delete return values, added tests