Tests reviewed

Please verify and send to Brian if you agree