add test to classname, use property instead of hardcoded false