Added storing test
Moved tests to their correct package