rearranged unit tests basic func
changed restricted access definition