introduce generic parameter
introduce generic parameter to vertex type
move a test to proper position