Adjusted hole tables, added tests