moved af tests back in