Small Test BugFixes