Re-fixed more tests