Added test implementation