Add test for the last commit #22