Updated all the puzzle elements and the test