Found the program bug
Clean up dead code

For additional clarity
Moved test files
Adjust segmenting values