Update: more tests