fixed bugs for : and updated test cases'