Add test, improve comment