Remove manual schema definition, fix table annotations.
Starting to fix tests