Code simplified, agtest folder removed.