Minor fixes + tests are deleted for now, these versions are not relevant already