FIX: Restore tests that were moved

Fix setup to include all test files.