adding tests, comments