converted more classes
add unit testing for System