Move base declarations to general name & clean reference from tests + fix readme