apply new name changes and refactor unittests code (hack)