Improve tests to use add_foreign_key DSL