[issue #166][Done][adding tests]