Update Konacha tests for new naming and folder conventions

...re