WIP: Refactor model classes into Active Record models; one test skipped