reformating multifile

Tests and reformating of code