Misc testing changes