fixed redeclaration warning - added street level tests