Enhanced comments
Very simple Unit Tests