fixed tests, and code formats