refactor data api & tests