WIP: Import rest of legacy store tests from original code