Updated unit-tests system
Updated refs