some renaming, a few more tests