Added optional binding to test cases implementation