fixed master. tests passing again