Re-add old tests.