[AP]{test after code} Test improvements