master #24 adding tests