r39: Added unit test for last commit