Discovery layer ready for testing