Cleanup / Add unit test for storage and bot