fixing unit tests for mobile