Testing multiple files + Stats + Bugfix