Use the data method
Add rest of core tests