get tests working with new name
remove unused variables reported by msvc