All master tests passing now