Testing merged to dev and testing removed