Updates and additions to spec and unit tests