1.Rename classes 2.Tests for 30 min talk class