Huge cleanup of tests