Eliminate test duplications
commit for testing