add more missing stuff to the test branch