remove redundancy from name, add tests