Moved spec to namespace, adapted test