- Update tests - Move test class to the core module (cherry picked from commit 4b8e504972)
4b8e504972