Fixed: PR comments. Added: tests