More evolution test and fixes