updated some of the files

removed bugs in expectations.