Updated for testing framework