added tests, support for more part #s