unit tests renamed and cleaned