Toolkit improvements and more thorough testing; static ActiveRecord extraction setup