workin on master tests