updated specs and model
updated tests