SAN-208
-adding tests