Also move the self test implementation guards so that alternate implementations must provide their own. Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>