Fixed fallout from merge conflicts (mostly incorrect imports or incorrect deletions). Made sure tests were correctly inheriting from the base model for teardown.