some renaming, finishing the tests etc.