Simplify dependencies
Format test