Unit tests introduced