Added javadoc to AMfactory, removed test classes