work on optional
improved optional unit tests, fixed a few bugs and added missing methods
fixed merge conficts
fixed dummy class constructor issue in optional unit tests