Fixes in visitor completeness test
Reworked source and condition classes