Add unitary tests