Unit test and check style fixes