reorganize tests folder in lieu of storm#53