Fixed some tests temporarily