controller & tests updated
spec files updates