most master tests now passing