Added multiple spec tests and modified views/models to support