naming change
unit tests restructurize
more unit tests