Updating schema
Renaming file to make it match more easily
Adding a very little test