Minor refactoring

- Algined on =
- Wrote more specs for the mock data