Fix miscellaneous tests