Make readme more readable
Add some additional tests