implement subsumes
more tests for subsumes
amend subsumes logic for volumes
fix subsumes tests for win32
tidy code files