Add test dir
Fix missing  extends