Updated final samples and changed tests to support new input sample