Next unit tests added