spec tests pass now