Moved sand extend in app, rearranged tests, changed sand to use class