made declarations in unit tests uniform