Fixing tests and adding 'meta' to model.