Changing #content & #test to classes