Replaced Criterrion with CMock. Added few tests, currently not working properly. Random test upgrades.
Piotr Krygier