Add Diagnostic methods

Add Diagnostic methods which are not implemented yet and add tests for those.