Added special unit functions and tests