Added: tests + Small fixes