Added feature testing