Fixed non-deterministic test failure and made mouse to cell conversion work correctly