Update current tests
Add more data to tests