MOB-756: Remove not used unit tests
MOB-756: Small fixes for A2.3 and other platforms