Small fixes to tests (TODO) and version number