Added advanced testing