Format code + try fix tests