Adding code coverage, and adding specs for basemodel