unwrap get data properly, fix specs