More updates on the datastructures
Fixed unittest
Ignoring correct cunit binary