Merge "Add unit test for Spa footer"