adding tests and adding defaults