Add some unitary tests