[BUILD,TEST] adapted coding style fixes to move to src directory

 * addendum to 7a3fc78aa507abe294850fba42719423f81c0d5c