Feature and Observation update functionality + Tests