Modify tests a bit