Miscellaneous spec test cleanup