fixed unit tests
some auto-formatting