Updated Testing Framework