added tests
Fixed coding standards