added new tests
fixed style