fix
A Little CleanUp, Rename
Fixed tests 66 and 68