Simplified some tests. Renamed some test methods.