caf tests added and modification accordingly
Merge pull request #36 from ypwalter/caf_tests

caf tests added and modification accordingly