Spark 4.0 - Duplicate existing tests + enhancements

After completing #406, we would need to run the tests to make sure we hit a 100% success rate.
In addition, we would need to add a few more tests related to any new APIs or features that were implemented along the way.