Add more tests to store