adding tests and other stuff