removed usage of deprecated classes in unit tests
removed usage of deprecated constants