removed power test
merge conflict fix
remove power test