Modify tests as required