Clean up (3)
Improve unit test