Test cleanup. Syntax closer to ideal.