Removed tests for the previous architecture