Fixing models meta-data, enabling more tests