Field tests and associated cleanup