Bugfixed Tests