Added test scheme