added advanced testing features