add more unit tests
fix use statement
add unit tests