Re-add tests