Modified tests, added AFN