add license comment + TODOs + rename test methods