Fixed some small unittest issues