GH #175 - Working on testcases.