Merge "Remove smoke.py and clean up base test classes"