rename and additional functionality for remote code and extra tests