cleanup vars & add tests into OptionalBinderTest.