Update & Test cases