Merge "Fix(?) Theme Tests"