Tried to implement expected date
Fixes test to amsstore
Merge branch 'master' into mike1
test for master merging