Revert "Fixed some obsolete tests in preparation for project restructure."

This reverts commit 5aef6a1f9f3241a86660e44bf4e010dac0ffd7d2.
Revert "Revert "Fixed some obsolete tests in preparation for project restructure.""

This reverts commit 77aedb3a2e02838bff44d880727b29e50e390acd.