Adds complex coverage stubs and Code Cleanup