more spec fixes

  test commit 4e19f87a91068be5ec2326406eb86d7e29053612
more specs

  test commit ee6e716e97a366a4e321c6ce036a5e8a9773a833
more specs

  test commit 4de3a44bb96f90dc774e1cee2df92a501ec051aa
more specs

  test commit 29756d397776d06dde9db194d870c183fcb4a3a6
more specs

  test commit 5e2d0eebc99faf2a04436554ecdba6cc41d57e74
more specs

  test commit d2ff74d0983846277df7361d619476351a250f07