Fix for Genius Tests