Update Behavioral / Template Method impl and test case