Re-added test files to build and fixed failing tests

No match.