Rename and fix tests