Unit tests

Can you merge this ?