Add initial self-tests