Updating tests to use new theme