Update tests a bit