Bugfixed tests