took out tests and put in master dir