Fixing more atests