Added test unit