Added test expectations to implement