Adding Base Model tests, incomplete.