Added test capabilities