Adding Tests for Model + Refactoring ATable
Adding Tests for Model + Refactoring ATable