Adding tests to AFS