More tests
Add blocks to cps