Fixed and added mores spec tests.
Fixed some spec tests. All of them now pass.