added first test and started rename of functions