Add test and add hole managment