Add support for init1 options, and include them in the testsuite
Add support for close fuction