Discovery module + few tests