Fixing Int->Long issues
Flat structures working again after switching to Scala 2.11 reflection
Moving common case class testing trait