updatign tests and adding AFC classes