Fixed tests, no DB; #38
Renamed file with role for data stash