CCA CS fixes
Rearranged structure
Added first test