fixed style and tests on newer os