Small fix
Data double-usage test
Bring all tests back