cleaning up test and implement smaler issues