Miscellaneous testing improvements