Worked on AOE Testing

Not perfect yet...