Moving unit test to tree where it belongs