Replace test class with real name and add margin