Some changes and testcases for those changes