Use defined properties to determine attribuets for serialization
Update specs to be compatible with latest RSpec deprecations