module test up
unit tests up
code cleanup