combined tests, updated formatting rules. ignored .vcg generated files