Cleaned up testaes.