Fixes some testing issues