Fixes for some test files
Will add test for new method later.