Some renaming and adding additional tests