GH #211 - Working on test cases.