Added Base Model and tests