Improve testing
Fix testing