Fixes some test errors