Bugfixes & graph stats for test