Update base test classes