Add unit test and update descriptions

Include IP comments as well