supplementary mobile tests
Moving more functions to private, using exports