some tests renamed and codeformat applied