fixed all bugs (mostly spec changes) in tests.