Fix testing issues
Fixes