Fix misc tests