Updating acceleration branch

Merging changes made to master into acceleration branch, updating tests to match new state size