renamed test method, added generator tests, fixed discovered bug