Restored some accidentally deleted tests