reworked classname and test names