Another test-case + bug fix for the code written today.