Unit tests added (incomplete)