Working on model and adding bll unit tests