Adjusted some stuff in the test package that was broken by some changes.