Changed naming scheme of tests