Fixed: tests and enhanced test cover